projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eae2aa7
df04326
)
bitkeeper revision 1.1389.1.45 (4283617cR1xdjJGK5MYgFMrtuHR22w)
author
cl349@firebug.cl.cam.ac.uk
<cl349@firebug.cl.cam.ac.uk>
Thu, 12 May 2005 14:00:28 +0000
(14:00 +0000)
committer
cl349@firebug.cl.cam.ac.uk
<cl349@firebug.cl.cam.ac.uk>
Thu, 12 May 2005 14:00:28 +0000
(14:00 +0000)
Merge firebug.cl.cam.ac.uk:/auto/homes/maw48/xen-3.0-resources.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
1
2
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
Simple merge